[Tutti-commits] 09/09: Livrable #8252 Merge branch 'feature/8252' into develop