Apply changes from patch #17

Closes #3000332

Merge request reports

Loading