Merge branch 'CLIMATE-968'