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