Resolve "Dimensionality refactor"

Merged Lauri Himanen requested to merge 1466-dimensionality-refactor into develop

Merge request reports