[Tutti-commits] 03/03: Livrable #8157 Merge branch 'feature/8157' into develop