Merge trunk version 204659 into gupc branch.