r10497: new version