lergo-528-initial commit