Merge changes of 1.9 -> 1.10 from main trunk.