[Tutti-commits] 03/03: Fixes #7944 Merge branch 'feature/7944-2' into develop