Transformer cleanup

Merged Christian Mahnke requested to merge transformer-cleanup into dev

Merge request reports