Merge "Changes to support asynchronous close interruption"