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