Changelog for #2028. Please insta-merge.