Merged changes from main CVS (up to 2.2.10)