address more review comments for bug 859756