Merge branch 'jk/commit-C-pick-empty' into maint