Moved to vbox user for build farm
Merge branch 'dev' into ms