Master bug#10597