[Tutti-commits] 03/03: Livrable #8202 Merge branch 'feature/8202' into develop