Merge pull request #23263 from ffontaine/fix-sudo-cpeid