Hot fix 1.2.1 change
Fixed severe production problem
Merge branch 'hotfix-1.2.1'