Resolved all merge conflicts.

Closes #3477231

Merge request reports

Loading