Merge pull request #10018 from ja-pa/treewide-cpe-id