Revert "Revert "Merge branch 'beta'""

This reverts commit fd2c6e032075ac7f613f810a50a7fae5149ccdcf.