This bug has been copied from bug #584367 and has been proposed to be backported to 5.5 z-stream (EUS).