[Tutti-commits] 02/02: Merge branch 'feature/7800' into develop Livrable #7800