Yesterday
merge from hopper_attachments_fix