Changed to match updated AsioService.
Merge remote-tracking branch 'origin/next' into ResourceHandler