Alexey, I added your patch from this bug to the merge in bug #255446. I haven't fully tested the merge yet, and maybe it need more changes (or actually drop some of the Ubuntu delta). Please test it if you can.
Alexey, I added your patch from this bug to the merge in bug #255446. I haven't fully tested the merge yet, and maybe it need more changes (or actually drop some of the Ubuntu delta). Please test it if you can.