Merge branch 'jl/commit-v-strip-marker' into maint