Rebase from develop
Remove fixes for old zsh