Includes_PVR.xml fix
Merge branch 'master' into test