Hotfix for 1.2.12
Merge branch 'hotfix/1.2.12-1'