Note that the patch I added inline in my initial mail here was alreadyDoes that mean I should not take the patch here in this email and thatThe patch that Thomas requested (commit 841c2be09fe) does not apply cleanly, so I'll take care of sending the backport.
you will submit it after some timeperiod, or that I should take this
patch as-is?
adapted to apply cleanly, at least on stable-5.4.y
May not have made that clear enough, so mentioning it here - ignore me this
message if that was read and thought of.