Comment 31 for bug 1732067

Hi fungi,

I proposed backport to stable/train as it was without any conflicts. For older branches it seems it may require some more work and maybe some other patches to be backported too but I don't think there is any problem with backporting this fix.
It introduced new config option, but it has default value that guarantee old behavior so I think we still can backport it.