am fe39394e: Merge "init: Adding support to import directories"

* commit 'fe39394e0b82ba5be905a1867dd79734b690e06c':
  init: Adding support to import directories