Issue #3581681: Fix quality code issues

Closes #3581681

Merge request reports

Loading