Merge "Change host selection for service"