Merge pull request #23084 from aparcar/pesudo