[DF-4792] - optimization fixes.