Merge "Enable hibernate write batching"