Undertow upgrade