Delivery Address retention when Pickup selected

Previously, when switching between Delivery and Pickup modes at checkout, once Pickup was chosen all unrelated Delivery fields were being cleared. Now, any entered fields present before the mode switch are stored temporarily and then restored back if the user reverts to Delivery mode. This is providing they have not navigated away from the checkout page, otherwise, the address fields are restored back to their defaults as set at time of new order creation.