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