New PR for #6224

New PR for #6224