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