[Tutti-commits] 03/03: Livrable #8248 Merge branch 'feature/8248' into develop