r11754: 3.8.5 final