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