Merge "CDS: Split out TransactionFutureCallback"