Merge branch 'CLIMATE-963'