Merge pull request #31971 from brson/beta-next

Beta next