Merge "Sync AsyncTaskManager code with adaptor" into devel/master