Merge "port test_server_rescue into v3 part1"