Merge branch 'CLIMATE-955'