Merge branch 'tf/prompt-preserve-exit-status'