Fix missed commits from the rebase.

Closes #3558749

Merge request reports

Loading