Merge dev into main

Merged Boris Baldassari requested to merge dev into main

Merge request reports