Maoumassou maoumassou patch 06414

Merge request reports