Merge branch 'fc/completion-zsh' into maint