Merged changes from main trunk up to 2.2.7