HSEARCH-1392 Reintroducing the versions used only in the modules
definitions. Updating them and commenting them accordingly.