Add CHANGELOG for #18034 [ci skip]