CB-5736 Support host names for target command