[DF-4762] Fix review comments