Merge pull request #90450 from compnerd/com-autoload