Change after the last merge on the 4.0.x branch