[Tutti-commits] 04/04: Livrable #8233 Merge branch 'feature/8233' into develop