pulled Rev eng stuff from HttpServer branch into master