diff --git a/CHANGES.md b/CHANGES.md
index 6632f4955..723090e23 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,6 +1,8 @@
 ## Version 2.0.0.dev24 (in development)
 
-* Cate now uses **Python 3.7** as a consequence of resolving [#824](https://github.com/CCI-Tools/cate/issues/824).
+* Cate now uses new CCI ODP service endpoints. [#825](https://github.com/CCI-Tools/cate/issues/825)
+* Fixed potential runtime performance bottleneck when creating spatial subsets, especially when downloading data subsets.
+* Cate now uses **Python 3.7** as a consequence of resolving. [#824](https://github.com/CCI-Tools/cate/issues/824)
 * Fixed broken build on Windows that lets Cate raise `ImportError: DLL load failed: The specified module could not be found`
   when loading GDAL shared libraries.  
   [#824](https://github.com/CCI-Tools/cate/issues/824)
diff --git a/cate/ds/esa_cci_odp.py b/cate/ds/esa_cci_odp.py
index 7178adb1b..aeef7c62e 100644
--- a/cate/ds/esa_cci_odp.py
+++ b/cate/ds/esa_cci_odp.py
@@ -71,11 +71,8 @@
              "Chris Bernat (Telespazio VEGA UK Ltd), " \
              "Paolo Pesciullesi (Telespazio VEGA UK Ltd)"
 
-_ESGF_CEDA_URL = "https://esgf-index1.ceda.ac.uk/esg-search/search/"
-# _ESGF_CEDA_URL = "https://cci-odp-index.ceda.ac.uk/esg-search/search/"
-
-_CSW_CEDA_URL = "https://csw.ceda.ac.uk/geonetwork/srv/eng/csw-CEDA-CCI"
-# _CSW_CEDA_URL = "https://csw-test.ceda.ac.uk/geonetwork/srv/eng/csw-CEDA-CCI"
+_ESGF_CEDA_URL = "https://cci-odp-index.ceda.ac.uk/esg-search/search/"
+_CSW_CEDA_URL = "https://csw-cci.ceda.ac.uk/geonetwork/srv/eng/csw-CEDA-CCI"
 
 _TIMESTAMP_FORMAT = "%Y-%m-%d %H:%M:%S"
 
@@ -863,8 +860,8 @@ def _make_local(self,
                                                                       if var_name not in var_names])
                             if region:
                                 remote_dataset = normalize_impl(remote_dataset)
-                                remote_dataset = adjust_spatial_attrs_impl(subset_spatial_impl(remote_dataset, region),
-                                                                           allow_point=False)
+                                remote_dataset = subset_spatial_impl(remote_dataset, region)
+                                remote_dataset = adjust_spatial_attrs_impl(remote_dataset, allow_point=False)
                                 if do_update_of_region_meta_info_once:
                                     local_ds.meta_info['bbox_minx'] = remote_dataset.attrs['geospatial_lon_min']
                                     local_ds.meta_info['bbox_maxx'] = remote_dataset.attrs['geospatial_lon_max']