Merge master changes back to beta

Merge master changes back to beta. New feature sets to start testing soon.