Some cleanup
Merge branch 'hotfix-2.2.10'