Merge bug25538 into stable (second time, unpick of bug 25677
stable to default (no-op)