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