Merge "asynchronous API changes"