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

0.4.8