[Tutti-commits] 08/08: Livrable #8245 Merge branch 'feature/8245' into develop