Added disabling/enabling PVP and GND