[Tutti-commits] 01/01: Livrable #8212 Merge branch 'feature/8212' into develop