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