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