Merge branch 'jk/pull-rebase-with-work-tree' into maint