Merge branch 'CLIMATE-381'