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