Some fixes for 0.9.2.2
Merge branch 'hotfix/0.9.2.2'
Merge tag '0.9.2.2' into develop

Merging 0.9.2.2