Call Queues Preserving CallerID

I am sure this is on the roadmap, but we're testing call queues and the callerID that an agent receives in a long GUID string rather than the original callerID.