Merge trunk version 212892 into gupc branch.