Merge branch 'js/import-zip'