Merge branch 'release-1.2' into develop
Fix bug before release - DEVELOP BRANCH
Merge branch 'develop' into release-1.2