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