Today
merge from hammer_overlay_fix