Resolve "Topology issues"

Merged Lauri Himanen requested to merge 1427-topology-issues into develop

Merge request reports