Update changelog
Update changelog

[skip ci]
Merge branch 'hotfix/0.21.16'
Merge branch 'master' into release/0.21.17
Update changelog
Merge branch 'release/0.21.17' into develop