[Tutti-commits] 08/08: Fixes #7996 Merge branch 'feature/7996' into develop-4.4.x