Merge branch 'release/v0.5' into develop