Today
Merge from softcore_modifiers_fix