Merging #539 3.3.x pvmanger changes to master (4.0)