Getting work done from dev branch

Merged Enzo Tarrery requested to merge dev into 5-team

Merge request reports