version 1.2.0
Merge branch 'release-1.2.0' into develop