Hi Jeff,
We have encountered same problem as you (in 9.5.4), it seems that so far it hasn’t been ported back from 9.6, but if you take this commit and apply it to 9.5 source codes, it seems to be working
But anyway, does anybody knows plans about backporting this to 9.5 official way?
Regards
Tomas