DEV-338: Integrated Erics code review edits
Merge branch 'DEV-338-code-review-assets-tool'

* DEV-338-code-review-assets-tool:
  DEV-338: Integrated Erics code review edits