Datasource refactor
Version 1.4.2
Merge 1.4.2 from further-1.4