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