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