Update changelog for #22061