Update CHANGELOG for #2630