Merge branch 'ml/completion-zsh' into next