Release prep
Merge branch 'release/0.4.0.8' into develop