Merge trunk version 212325 into gupc branch.