Merge latest fixes from staging/dev

Merged Boris Baldassari requested to merge dev into main

Merge request reports