r8538: changes