Merge branch 'nd/root-git'