[Tutti-commits] 02/02: livrable #8199 Merge branch 'feature/8199' into develop