Merge latest devs from staging (minor changes)

Merged Boris Baldassari requested to merge staging into dev

Merge request reports