Merge "Revert "BUG 6838: Retry Mechanism for Batched Transaction""