[DF-3978] performance optimizations