Why not just backport the fix since this is already a confirmed upstream issue and an upstream patch is already available?
Why not just backport the fix since this is already a confirmed upstream issue and an upstream patch is already available?