lergo-339 backend changes first commit