This bug has been copied from bug #526837 and has been proposed to be backported to 5.4 z-stream (EUS).
Not a zstream candidate anymore: the symptom the patch was trying to fix on 5.5 was fixed by a different patch.