Comment 14 for bug 1436034

Yep, I made a patch for 6.0 branch with backported fix from 0.1.12 https://review.fuel-infra.org/#/c/5169/

It has some issues with unit tests, but I don't think it's critical, because locally all tests have passed well.

I'm going to make the same patches for 6.0.1 and 6.1.