Merge "fix a memory leakage when Queue search or discovery event." into klp-dev