Merge branch 'jk/maint-commit-v-strip' into jk/commit-v-strip