Please vote for this in the Ideas portal. I'm guessing we are not the only VAR with this issue.

https://oneview.mitel.com/s/idea/0870h000000Q5VGAA0