Merge trunk version 208955 into gupc branch.