Finish removal of VP

See merge request !693 (merged) (cherry picked from commit 8c812856)

Merge request reports

Loading