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