Pvmanager extra feature

cherry picking #524