Merge pull request #31470 from hongkailiu/rm-bugs-OCPBUGS-86009