Merge branch 'fc/zsh-leftover-bits'