merge from Pipich

Merge request reports

Loading