[Tutti-commits] 04/04: Livrable #8278 Merge branch 'feature/8278' into develop