[Tutti-commits] 05/05: fixes #6541