[Tutti-commits] 09/09: fixes #6471