adjust the docs for Async/Task
Merge with upstream