Yesterday
merge from targeting_attachment_slot_fix