Master bug#10163