Merge branch 'feature/reuse-badge' into 'master'

Merged Hamza Oukili requested to merge cherry-pick-fa8e2951 into releases/3.7

Merge request reports