ITF refactoring now ok: fixed plugin.xml (merge with plugin.xml_gen)