Fix/staggered upwindfluxvars

Merged Kilian Weishaupt requested to merge fix/staggered-upwindfluxvars into master

Merge request reports