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