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