8.0 merge to ehorvat

Merge request reports

Loading