Merge trunk version 217032 into gupc branch.