Merge trunk version 201483 into gupc branch.