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