r10499: new version