Merge pull request #17124 from vincentbernat/fix/zsh-option-stacking

zsh: enable option stacking