[Tutti-commits] 01/02: fixes #6635