[g3dvl] merge fix