Merge "memory leakage: release DLS handles during shutdown"