Merge branch 'vs/completion-with-set-u' into master