Forward port #924 to 3.x