CRF 45773

changes based on code review.