REL-1596: Made changes as per code review.