Merge branch 'CLIMATE-962'