Merge branch 'fc/zsh-completion' into maint