Merge branch '3606_shell_segfault'