Merge pull request #294 from ssamartyn/develop

Improve message for ZEN-13243
Fix for ZEN-15762: added total bytes property for analytics
Merge pull request #295 from ssvsergeyev/develop

Fix for ZEN-15762: added total bytes property for analytics
Fix for ZEN-13243
Merge remote branch 'upstream/develop' into develop