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