Merge branch 'feature/fixes/korenkova' into 'main'

Feature/fixes/korenkova

See merge request !48
2 jobs for main in 2 minutes and 25 seconds (queued for 8 seconds)