Merge "Added data retry manager and retry rules"