Updated to v1.2
Merge branch 'release/v1.2' into develop