Merge branch 'support-credit-card-creation-with-existing-billing-address' into catching_up