Merge branch 'develop' into fix-681 and fix misses