Merge branch 'sg/completion-config'