Merge branch 'master' into 'production'

Hakimrequested to merge
master into production

Merge branch master into prod

Merge request reports