[DF-4684] fixes.