merge 3.3.x pvmanager changes

also 0f3d7038923e5a1904ed1b691b64b7e7de5ea28a corrects a rap 2.0 migration