Merge updates from stripe-easy