Merge branch 'release/0.5.17' into develop
Merge branch 'master' into develop