Dev

Merged Christian Mahnke requested to merge dev into mapping

Merge request reports