Merge branch 'nd/branch-v-alignment'