Changelog for #466 and #468