[OE-3987] changes to support transactions