Merge trunk version 206575 into gupc branch.