Merge branch '3642_subshell_optional'