Merge branch 'sg/completion'