Merge "Split out ChainedTransactionProxy"