retarget #1994 to 2.10.x