Add CHANGELOG entry for #12635.