> This fix will be in 2.3.6.

From the official website, where this upstream patch also originates.