Changelog for #800 / #804.

[ci skip]