Make sure to only import files if it is enabled
Merge branch 'master' into new-archi-deploy

* master:
  Make sure to only import files if it is enabled