Merge branch '1490_exit_subshell_fix'