Mem leak fix

Merged Qi Chu requested to merge mem_leak_fix into master

Fix the memory leak and one corner case of bypass pipeline.

Merge request reports