#3505336: Updates from code review

Related to #3505336

Merge request reports

Loading