Merge branch 'nk/branch-v-abbrev'