[Tutti-commits] 03/03: Fixes #7161 Merge branch 'feature/7161' into develop