Merge "master" and "async-beta1"