[Tutti-commits] 01/01: Fixes #7278 Merge branch 'feature/7278' into develop