Merge trunk version 193807 into gupc branch.