Merge branch '3001_subshell_prompt_fix'