Merge trunk version 195707 into gupc branch.