Merge master changes back to vbox-beta

Merge master changes back to vbox-beta