[DF-4571] fix review issues.