Looks like there is confirmation on the upstream bug and patch is upstream: 945b2b2d259d1a4364a2799e80e8ff32f8c6ee6f
Looks like there is confirmation on the upstream bug and patch is upstream: 364a2799e80e8ff 32f8c6ee6f
945b2b2d259d1a4