[Tutti-commits] 05/06: fixes #8014 Merge branch 'feature/8014' into develop-4.4.x