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