Jetty-Override branch