Release prep
Merge branch 'release/0.4.8' into develop