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