Comment 13 for bug 1876065

Thanks, I tweaked the diff to apply the change to the existing patch, no need to stack fixes when the issue comes from a previous change, and I've uploaded to groovy and focal