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