Merge branch 'FixAttachmentsOnHTTPSURLs'