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