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