Can you try and use the upstream patch in the patches block (or at least link it)? Thanks.