Merge main int fix/report

1 job for !17 with fix/report
latest merge request