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