#3570280: Fix code issues

Closes #3570280

Merge request reports

Loading