vGPU merge to trunk