[DF-4626] review fixes