deploy_extra_import: bug fixing
Merge branch 'master' into develop