Merge "Correct timeout_dumper to TIMEOUT_DUMPER"