Merge remote-tracking branch 'refs/remotes/kali/fix-changelog-year' into develop