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