Merge branch 'extra-start-dirs'