Merge trunk version 195937 into gupc branch.