Merge branch 'CLIMATE-966'