Merge "Attempt retry for broken dictionaries"