Datasource and contextSystem fix for the demo, to be cleaned!
datasource and ContextSystem
must be cleaned!
Merge remote-tracking branch 'origin/feature/Feature-datasource-contextSys' into develop