[OE-3987] work on transactions