Merge "UI support for multiple host per port"