Refactor code.

Closes #3284143

Merge request reports

Loading