Merge branch 'CLIMATE-952'