Merge "Async task support"