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