[DF-3293] Fixed review comments.