lergo-172-final commit