Fix cherry picking issue in DatasourceComponent