[Blue-HD] PVRState re-location