hotfix 1.9.9
Merge branch 'hotfix-1.9.9'