Merged changes from main trunk 2.2.1-2.2.2