[Tutti-commits] 03/03: Fixes #8055 Merge branch 'feature/8055' into develop