Code

Merge branch 'sg/completion-cleanup'