[Tutti-commits] 02/02: Fixes #8107 Merge branch 'feature/8107' into develop