[DF-5077] Fix review issues