Begin merge in web server code