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