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