Merged r11309:11357 from grc branch.