ISSUE-1785: fixed comments from review.