Merge branch 'jc/prompt-upstream'