Fix for issue #940
Fixing issue with not providing a datasource
Fixing issue with not providing a datasource
Merge branch 'develop'