[Tutti-commits] 01/01: Fixes #8085 Merge branch 'feature/8085_univers-disjoint' into develop