Merge branch 'develop' into pr/1285