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