Merge branch 'CLIMATE-970'