[DF-1619] Fixed new review issues.