Fixing issue with not providing a datasource
Merge branch 'develop'