Adding missing datasource definition
Adding missing datasource definition and fixing issue with hiding tabs
Merge branch 'develop'