Merge pull request #31917 from brson/beta-next

Beta next