Merge pull request #29262 from brson/beta-next

Beta next