Merge branch 'so/prompt-command'