[Tutti-commits] 03/03: fixes #6373