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