[DF-2748] fix all review issues