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