Importing changes from Andrea

Merge request reports