Merge branch 'jk/commit-v-strip'