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