[Tutti-commits] 05/05: Fixes #8114 Merge branch 'feature/8114' into develop