Merge "add additional dump for timeout"