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