Merge branch 'release/v1.2.0'
Updated CHANGES for v1.2.1
Merge branch 'hotfix/v1.2.1' into develop