Merge "DO NOT MERGE - fix memory leak in PatchPanel" into lmp-mr1-dev