Merge branch 'sg/completion-omit-credential-helpers' into next