Cleanup/volvars

Merged Kilian Weishaupt requested to merge cleanup/volvars into next

Merge request reports