Merge trunk version 227333 into gupc branch.