Today
merge from deployguide_swamp_brightness_fix