Fix/staggered privars

Merged Kilian Weishaupt requested to merge fix/staggered-privars into next

Merge request reports