Updated for generic hostname usage
Merge remote-tracking branch 'refs/remotes/origin/web-server-integration' into web-server-integration
Updated syntax