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