Fix dev

Merged Christian Mahnke requested to merge fix-dev into dev

Merge request reports