Merge "fix memory leak in PatchPanel"