Merge trunk version 212522 into gupc branch.