Promote improved keep-alive support to improvement #1