Included changes in prep of host name change and proxy