Merge trunk version 222452 into gupc branch.