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