Draft: Git pull fixes

Merged Boris Baldassari requested to merge staging into dev

Merge request reports