r10984: new version