Merge branch 'release/0.4.0.7' into develop
Release prep
Merge branch 'release/0.4.0.8'