1.2.9 fixes
Merge branch 'hotfix/1.2.9'