Comment 9 for bug 1753938

Ok Benjamin, I filed bug 1762315 for a) on change #1

I'm rather sure it is a good change since it is already tested by me and was in Bionic a while without complaints. Never the less I need an FFE given the time. So lets see if we run into any trouble there being so late.

If you get to upstream #2 completely let me know for some later Ubuntu versions to integrate it (if the normal pick via upstream merge isn't fast enough).