Merge branch 'nd/multiple-work-trees'