Master bug10578