Merge "Port issue fix in control panel"