Cleanup/staggered remove privar class

Merged Kilian Weishaupt requested to merge cleanup/staggered-remove-privar-class into next

Merge request reports