Merge branch 'release/1.12' into develop
Changed version to 1.12
Merge branch 'develop'