Merge trunk version 193672 into gupc branch.