Merge main branck into carlos-edits to integrate Amandine and Stephane's and and Carlos' codes

Closed carlosuc3m requested to merge main into carlos-edits

Merge request reports