Any way to combine orders onto shipment by address data rather than address id/key?

With the Ship Separately feature turned off, we would like to combine sales orders shipping to the same address into one shipment, which is a feature of Process Orders/Create Shipment.

Unfortunately, the combine or not combine logic appears to be based solely on the address id key, rather than the same address data (name, address, city, state, postal code). Our customer often uses the override address on sales orders, rather than create permanent customer locations. Acumatica creates brand new records for each new sales order with an overridden address, even though the address data is exactly the same. The combine shipment feature does not work for us because these override addresses will always have different address id’s, even when the address data is verbatim.

Is there anyway to either:

1. Prevent new address record if an existing customer address record matches exactly? Or 
2. Configure combine address logic on Process Orders/Create Shipment to look at the address data rather than the address id/key?

Thank you.