[DF-568] - more optimizations.