Yesterday
Merge from climate_volume_blending_fix