[DF-2151]fix revie issues