I am closing this for now, we will reconsider backporting it once we know how the fix will look like.