[DF-3351] Fixed review issues.