#3554362 Code refactoring

Closes #3554362

Merge request reports

Loading