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