Upstream has no solution yet. If possible, let's wait a bit and then see. If there well be no upstream fix, we will investigate further.