Today
merge from canyon-fog-fix