Master bug 10595