Merge branch 'sg/completion-zsh-workaround'