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