Has anyone figured out how to get this to show the correct address on the Service Order?

I have noticed that when creating a Service Order (SVO) from a Sales Order.

If the sales order includes a Location that is not MAIN one of two things happen

1. The SVO type has the AppAddressSource (Take Address and Contact Information From) set to Contact
   1. Then Acumatica creates the Service Order with the MAIN Location address even though the Location is not main (This is because the Contact is linked to the Business Account and not a Location)
2. The SVO type has the APPAddressSource (Take Address and Contact Information From) set to Business Account
   1. Then Acumatica goes into an endless loop following this message
      1. This was a known issue way back in CRM with this 

          

   2.