Code

Merge branch 'jk/prompt-fallback-to-tty' into maint