using restaurant.json as the datasrc
Merge branch 'activity-optimization'