[DF-3085] fix reivew issues