r10683: new upstream