Merge pull request #121026 from LanzaSchneider/fix-character-body-2d-compilation