Merge "Bug 5577 Retry mechanism"