Master bug 10581