Merge "Fix ordering bug in Async Proxy"