Multiple payment method support.
Merge branch 'refs/heads/dev' into dev-no-initial-auth