Merge branch 'hotfix/0.9.16'
Merge branch 'release/0.9.17'