Comment 5 for bug 1652595

The patch attached to comment #2 does not appear to be a fix for the issue reported in this bug. Could you pls point me to an upstream fix you might have identified that addresses this issue? I can make a best effort in merging that patch in Ubuntu.