Prep for release
Merge branch 'release/0.5.2' into develop
Resolve merge conflicts