Merge "Fixed crash in data service"