Updated attachments support (working)
Manual merge