lergo-339-second commit