Merge trunk version 204942 into gupc branch.