[Tutti-commits] 05/05: Fixes #7163 Testable #7163 Merge branch 'feature/7163' into develop