Release prep
Merge branch 'release/0.4.9' into develop