Merge "Add a retry mechanism when error is recoverable"