[Tutti-commits] 05/05: fixes #6147 fixes #6149 Merge branch 'feature/6147' into develop