Sync with 6.0.0 datasource changes

- syncs master with previous 6.0.0 changes