Merge branch 'CLIMATE-965'