Merge branch 'fc/untracked-zsh-prompt' into maint