Fix regresssions from merge

Merge request reports

Loading