Commit #400 - complete rework of transaction handling for all persistence modules