8.0 port mr18 commits

Merged Gabriel Davini requested to merge 8.0-port_MR18_commits into 8.0-stage

Merge request reports