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