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