Fix/correct production bugs

Jérémy Destin requested to merge fix/correct-production-bugs into master

Merge request reports