Merge from coinbase master