lergo-171-third commit