Merge branch 'pk/fast-import-dirs'