Merge trunk version 203514 into gupc branch.