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