merged 6ac6e4d from thevm