Merge pull request #22197 from oskarirauta/zsh