Today
merge from decay_scale_ui_fix