Merge pull request #31469 from hongkailiu/rm-bugs-cccm