Merge branch 'tm/zsh-complete-switch-restore'