Merge branch 'hotfix/1.1.2'
Only unzip if linux
Merge branch 'hotfix/1.1.3' into develop