Merge pull request #31471 from hongkailiu/rm-bugs-OCPBUGS-66225