Note: not backporting to the 14.10.x branch as it feels too risky (current Jetty version on that branch is 10.0.7).