Sync prod and master

Merged fagi requested to merge prod into master

Merge request reports