[DF-4779] Fix review comments