[Tutti-commits] 02/02: Fixes #7984 Merge branch 'feature/7984' into develop