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