Merge trunk version 204345 into gupc branch.