Resolve SDC-355

Implemented the fixes mentioned by @mancini during review.

Merge request reports

Loading