Merge pull request #90484 from beccadax/we-all-live-in-a-yellow-submodule