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