EDOC-631 : resolve dependencies. probably temporary
EDOC-631 : dependencies