DATAREDIS-356 - Applied changes from code review.