Sync with master : update datasource update call and minor changes.