chore: merge conflict resolve (main->dev)

Placeholder Miłosz Grocholewskirequested to merge
feat/marge-main-to-development into development

Merge request reports