Merge pull request #34635 from alexcrichton/beta-next

Last minute backports to beta