Added system zip export
Merge branch 'hotfix/2.3.3'