Merge "Remove recorded modification Futures from TransactionContext"