Lergo-179 : second commit