[DF-4688] Fix review issues