Merge branch 'CLIMATE-942'