Merge "Support async operation in handle_esp"