Merge pull request #90468 from compnerd/com-conformances