Fix regressions introduced by code cleaning

Merge request reports

Loading