Develop

Merged Maria Paniw requested to merge develop into main

Fixes in the app.

Merge request reports