Get Amandine's code

Merged carlosuc3m requested to merge main into carlos-edits

Merge request reports