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