New mapper

Merged Christian Mahnke requested to merge new-mapper into dev

Merge request reports