Changelog bump for #6352 changes