Comment 13 for bug 1922464

Sorry for the delay, I finally got back to that request but it's not as simple as backporting the one patch, the codebase changed between .20 and .25 and other changes are needed. Would anyone interest to work on a proper backport and testing, I personally doesn't really have the free slots for doing that at the moment.