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