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