Hi Mike,
Yes, this is something that used to work fine back in 12.5.x, then something happened and nobody noticed for a long time.
CR 718287 is open to have the fix backported to 15.7.x. I'd recommend opening an incident to add your voice to the request.
I'm checking for ways to get at this in the query tree.
-bret