Synchronize recent beta features to the mainline branchAs the title says, synchronize recent beta features to the mainline branch