Fix batch transaction export on D8/9