Call Queues Preserving CallerID

I am migrating my company to Skype for Business Voice from our previous phone system provider and everything has been working pretty smooth until now. I was able to setup the AA and Call Queues we needed but quickly came across the GUID in the Caller ID issue. I looked through all settings and could not find the solution. I finally caved and contact O365 support. Unfortunately, they didn't have any answers for me. They couldn't even confirm if this issue was actually being looked into. They referred me to this thread which unfortunately didn't provide any answers either. At least I know we are not the only ones with this issue.

It is very discouraging that this issue has been going on since February and still not fixed. I really hope this issue is resolved soon.