Merge branch '3639_subshell_output_lost_fix'