Merge with txn branch