Merge "Add a logging handler on timeout."