Merge branch 'jk/completion-rebase' into maint