addressig MR comments of previous PR

Merged Aman Verma requested to merge users/amaverma/AddressMRComments into master

Addressing comments of previous MR !10 (diffs)

@kibattul, FYI

Merge request reports