Preparation for Dusting the Universe

Merged Martin Glatzle requested to merge dev into master

Merge what's ready to be shown into master.

Edited by Martin Glatzle

Merge request reports