Sync with diff r11.