Fixed in 4.2 and 4.3 branches. This fix is temporary in that it will replaced in 5.0.0