Merge "Use AsynChannel for synchronous API"