Merge trunk version 178795 into gupc branch.