r1564: checking in changes for 2.2.10