r1799: added transaction support