I merged back the changes made in Branch_3_2 to trunk Please use trunk from now if you need to work on: - Search - Validator - Commons Annotations - Annotations - EntityManager If everything went well, I did not break tools, but have a look :-)