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