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