Merge branch 'release/1.2'
Merge tag '1.2' into develop

1.2