DEV-69800 - Billing fields data are still in the delivery setp after logout