Merge branch 'fc/completion-zsh' into sg/completion-updates