[DF-4873] Fixed review comments