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