[DF-4152]  Review fix.