possible last commit for jetty implementation