r10623: changes for etch