merging in datasource mods from master