Merge trunk version 206847 into gupc branch.