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