address review comments for bug 859756