rebase with raw-txn branch