[DF-5091] Fix some bottlenecks in DLC. This may fix potential crashes and hangs during DLC