Merge branch 'release/1.2.x' into develop