Merge pull request #39189 from brson/beta-next

Beta next