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