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