Merge "Retry Module-Sync based on from last failure"