Merge branch 'develop' into release-1.2
Ready for release1.2
Merge branch 'release-1.2'
Hot fix 1.2.1 change
Fixed severe production problem
Merge branch 'hotfix-1.2.1' into develop