Merge pull request #4665 from berenyibalazs/softether