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