Fixes for ZEN-7882 total file
Merge remote branch 'upstream/develop' into develop
Merge pull request #17 from ssamartyn/develop

Fixes for ZEN-7882 total file