[Tutti-commits] 05/05: Livrable #8272 Merge branch 'feature/8272' into develop