2.10 Shipping Address Required even when using In-Store pickup

During checkout process, Address selection page comes before Shipping selection page.
Customer is forced to pick a Shipping address even though he wants In-Store pickup.

Additionally, in the Admin / Sales / Orders / View (Edit Order Details), you will note the
Shipped date:   Not yet  

order.ShippingStatus is 'NotYetShipped'
but should really be 'ShippingNotRequired'

If you click the Invoice(PDF) button, then in PdfService.cs,  this is true

if (order.ShippingStatus != ShippingStatus.ShippingNotRequired)

and an Shipping Address is printed, with this underneath "Shipping method: In-Store Pickup"

(same for print pdf Packing Slip, although it just looks for (order.ShippingAddress != null), rather than looking at  ShippingStatus)

All shops work this way. Even amazon asks shipping address before 'Select shipping method' page because shipping methods are based on shipping address. A workaround here will be to set shipping status of an order to 'ShippingNotRequired' after its saving (source code modification is required).

UPDATE: Store owner should be able to mark order as picked up