Update changelog, fix version number

[ci skip]
Merge remote-tracking branch 'main/master'