I've tried to apply suggested patch to local 192a384408cc846d8e66e91a67cd9ad4e7f0be24 and it doesn't help.

--
wbr, Kirill