refactor fix for #14393 and add CHANGELOG