Merging r11186:11273 from grc branch.