[Tutti-commits] 02/02: Fixes #8118 Merge branch 'feature/8118' into develop