Changelog for #2707/#2722