Master bug#10429