T7003

Merged Nicolas Russo requested to merge T7003 into 8.0

Merge request reports