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