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