Merge "Enhance provider timeout error message"