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