Update main

Merged Maria Paniw requested to merge develop into main

This reverts merge request !35 (merged)

Merge request reports