Backport Vc fixes to 2.6

Closes: #89 (closed)

Merge request reports

Loading