[Tutti-commits] 01/01: fixes #6157 Merge branch 'feature/6157' into develop