SRC 119753

changes based on code review.