Add CHANGELOG enty for #11235