Show Original Callers Number in Caller ID When Transferring Calls on Mitel Phones

We are having an issue where the wrong caller ID is displayed when we transfer calls. When you transfer a call, if you press the speed dial on your phone, it will display the user's extension for the person receiving the transfer instead of the caller’s phone number. It is very confusing when we answer the phone expecting it was an internal call only to find an external caller. It appears that this was corrected for some other phone manufacturers, https://ideas.ringcentral.com/ideas/ENTCOM-I-48. Can you please correct it on the Mitel phones? We are using the Mitel 6940 phones.