Merge branch 'sg/completion-remote' into maint