Merge trunk version 208447 into gupc branch.