Change paths to NoOutput and StandardOutput
Merge branch 'CLI' into develop

* CLI:
  Change paths to NoOutput and StandardOutput