Merge tag 'v1.2.0' into stable

Version 1.2.0
Merge branch 'master' into stable