[Tutti-commits] 06/06: Fixes #8151 Merge branch 'feature/8151' into develop