Full merge of Twilio version