UC-2755:  Changes after code review.