Merge pull request #3440 from urbalazs/improve-noddos