,erged latest changes for version 3.3 to trunk