Merge "correcting the virtual baremetal defaults"