Today
Merge from fog_fixes