Merge "Fix a race PingPongTransactionChain"