8.0 ehorvat partial

Merged Eric Horvat requested to merge 8.0-ehorvat into 8.0-stage

Merge request reports