[Tutti-commits] 03/03: Fixes #8023 Merge branch 'feature/8023' into develop