Merge trunk version 216723 into gupc branch.