Merge trunk version 209179 into gupc branch.