Mapper

Merged Christian Mahnke requested to merge mapper into dev

Merge request reports