Includes_PVR.xml merge fix