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