Merge branch 'rr/completion-branch-config'