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