Merge pull request #33719 from alexcrichton/beta-next

Backport #33478 to beta, bump version