Code

Merge branch 'sg/completion-updates'