Backport the HttpPostRequestEncoder fixes by @igstan / Inspector warning