Merge trunk version 198815 into gupc branch.