Fixing code review changes from comment #26

Closes #3273173

Merge request reports

Loading