Merge "Increase ping timeout from 60 to 120 seconds"