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