r2090 + fixed find_object_ip_helper and some underlying code