Merge pull request #7949 from dengqf6/zsh