CDB-3619 Ongoing datasource work