Hotfix 0.4.9
Merge branch 'hotfix/0.4.9'
Merge tag '0.4.9' into develop

0.4.9