Merge "Support for removing hanging ports"