Merge trunk version 220104 into gupc branch.