Merge branch 'CLIMATE-954'