1.2 branch update
Merge branch 'release-1.2' into develop