[Tutti-commits] 06/06: fixes #6601