Merge trunk version 195164 into gupc branch.