deploy_extra_export: refactoring
Merge branch 'master' into develop