Merge branch 'release/1.2' into develop
Merge branch 'develop'