[DF-5025] Fix review issues