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