copied/pasted merge conflicts from Braintree branch