Merged changes from local Onebip VM