Tim.escher master patch 67096

Merge request reports