Restore fake data source
Merge branch 'develop'