Merge "CDS: fix TransactionProxy close()/ready() interaction"