Created by: sashaostrikov
Fixing the build in main
existing tests
Push commits to the source branch or add previously merged commits to review them.
