Merge master changes back to beta

Merge master changes back to beta