TransactionManager refactor
Merge fix