r10646: updates