Changelog entry.
Merge branch 't/9794' into major