Master bug #10371