v1.2.11 hotfix
Merge branch 'hotfix/1.2.11n'