Merge "Use proper column in loadAttachmentCallback"