Merge "PatchPanel: Cleanup and refactoring"