Careful meets checking of PR#40169

[Dirk-Willem van Gulik]

Any reason why we never applied

        https://issues.apache.org/bugzilla/show_bug.cgi?id=40169

It looks sensible to me - and would, as a side effect fix a simple  
edge case. But I am not sure I get all its ramfications.

Thanks,

Dw.