Update changelog
Merge branch 'release/0.21.12' into develop