Merge pull request #63763 from jakebailey/main-ts7