Need to forward port the changelog entries from the `6.x` branch to the `main` branch, before the first full `7.x` release.