[DF-1785] Fixed review comments