Merge "Fixed race condition in data connection"