Outgoing Faxes from UCP not using Extension's Caller ID

Sending Faxes from UCP gives a Caller ID of the Extension, not the Caller ID listed on the Extension (our Trunks don't have a Caller ID specified, as each Extension has its own DID).

I found this issue that seems to report the same thing and says it is fixed, from an earlier FreePBX version... FREEPBX-7268.

I also found discussion of this problem more recently in the Community Forums: https://community.freepbx.org/t/outbound-fax-caller-id/41000

This PBX uses 4 digit extensions, and each extension has a 10-digit US DID mapped for Inbound and has that same 10-digit US DID configured as its Outbound CID.

I confirmed on another FreePBX system I administer that this problem is occurring in FreePBX 13 as well.

I've attached an Asterisk log of the outgoing fax.

I suppose this hasn't showed as a big problem since most faxes report the Header and Station Identifier, but it did have me very confused when troubleshooting a problem today, and sure would be nice to have Outgoing Faxes use the Outbound CID of the linked Extension.  The Extensions we pair with Users for Faxing in UCP are Virtual Extensions, in case that matters.

Thanks,

Dave