Merge trunk version 221103 into gupc branch.