Merge "Fixed crash in data connection"