[Tutti-commits] 02/02: fixes #8335