Address review comments for !440

Merge request reports

Loading