Merge branch 'jp/symlink-dirs'