Merge branch 'pw/completion-show-branch' into maint