Merge branch 'jp/symlink-dirs' into maint