Merge pull request #2338 from BogdanovKirill/httpwritefix3